Added missing folder
Added build path
Merge branch 'master' into devel
Removed accidental inp file
Fixed python 3.4 compatability
Merge branch 'py34' into devel