Merge branch 'feature/gammas' into feature/hadrons

# Conflicts:
#	.gitignore
#	lib/qcd/spin/Dirac.cc
#	scripts/filelist

lib/serialisation/MacroMagic.h

@@ -150,14 +150,14 @@ friend inline bool operator==(const cname &lhs, const cname &rhs) {\
 class name: public Grid::Serializable\
 {\
 public:\
-  enum EnumType\
+  enum\
   {\
     GRID_MACRO_EVAL(GRID_MACRO_MAP(GRID_MACRO_ENUMVAL,__VA_ARGS__))\
     undefname = -1\
   };\
 public:\
   name(void): value_(undefname) {};\
-  name(EnumType value): value_(value) {};\
+  name(int value): value_(value) {};\
   template <typename T>\
   static inline void write(Grid::Writer<T> &WR,const std::string &s, const name &obj)\
   {\
@@ -177,7 +177,7 @@ public:\
     GRID_MACRO_EVAL(GRID_MACRO_MAP(GRID_MACRO_ENUMTEST,__VA_ARGS__))\
     else {obj = name::undefname;}\
   }\
-  inline operator EnumType(void) const\
+  inline operator int(void) const\
   {\
     return value_;\
   }\
@@ -190,7 +190,7 @@ public:\
     return os;\
   }\
 private:\
-  EnumType value_;\
+  int value_;\
 };